# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/06/22 10:36:26-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/ia64-extras
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# include/linux/fs.h
#   2004/06/22 10:36:24-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/pci_root.c
#   2004/06/22 10:36:24-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/pci-pc.c
#   2004/06/22 10:36:24-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/mpparse.c
#   2004/06/22 10:36:24-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2004/06/22 10:36:24-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/06/22 10:36:24-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/06/22 10:34:34-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/linux-2.4
#   into hp.com:/home/helgaas/linux/ia64-extras
# 
# include/linux/fs.h
#   2004/06/22 10:34:32-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/pci_root.c
#   2004/06/22 10:34:32-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/pci-pc.c
#   2004/06/22 10:34:32-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/mpparse.c
#   2004/06/22 10:34:32-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/06/22 10:34:32-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2004/06/22 10:34:31-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
#